Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SYNC #10

Merged
merged 17 commits into from
Feb 13, 2020
Merged

SYNC #10

merged 17 commits into from
Feb 13, 2020

Conversation

sssash18
Copy link
Owner

Fixes #1 (<=== Add issue number here)

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

imajit and others added 17 commits February 6, 2020 20:51
Fixes bug of logging out of loggout account
* Condition for not blocking itself

* Admin not able to block itself
Bumps [unicode-emoji](https://github.com/janlelis/unicode-emoji) from 2.3.1 to 2.4.0.
- [Release notes](https://github.com/janlelis/unicode-emoji/releases)
- [Changelog](https://github.com/janlelis/unicode-emoji/blob/master/CHANGELOG.md)
- [Commits](janlelis/unicode-emoji@v2.3.1...v2.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.18.0 to 0.18.1.
- [Release notes](https://github.com/colszowka/simplecov/releases)
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md)
- [Commits](simplecov-ruby/simplecov@v0.18.0...v0.18.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Added margin-right of 5px to the dropdown div class for better styling
* image disappearance improved

* changes improved

* Css improved

* css improved

* css improved
* added status

* status message is added

* space added

* space added
…uts/application.html.erb) (#7455)

* Update tools_places.html.erb

* Update application.html.erb

* Revert "Update tools_places.html.erb"

This reverts commit 40e0191.
changed <span class="fa fa-white"></span> ==> <span class="fas fa-bars fa-white"></span>
@sssash18 sssash18 merged commit f5a8a84 into sssash18:master Feb 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants